build: Add gtk-css static library

This library is meant to be the new CSS library that gets used from GDK,
GSK and GTK for string printing and parsing.

As a first step, move GtkCssProviderError into it.

While doing so, split it into GtkCssParserError (for critical problems)
and GtkCssParserWarning (for non-critical problems).

diff --git a/demos/gtk-demo/css_basics.c b/demos/gtk-demo/css_basics.c
index f7770b55105c6587c6d567a307c04a564100280f..258aacb46bd1d757ef0014a78a1baf1dc1ce3212 100644 (file)
--- a/demos/gtk-demo/css_basics.c
+++ b/demos/gtk-demo/css_basics.c
@@ -25,7 +25,7 @@ show_parsing_error (GtkCssProvider *provider,
                                           gtk_css_section_get_end_line (section),
                                           gtk_css_section_get_end_position (section));
 
-  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
+  if (error->domain == GTK_CSS_PARSER_WARNING)
     tag_name = "warning";
   else
     tag_name = "error";

diff --git a/demos/gtk-demo/css_multiplebgs.c b/demos/gtk-demo/css_multiplebgs.c
index 1f5adbcf659e957af72d3c0607d5cc8fe1c4cb42..e865521bbac08c709dbdaaec0188fb47a965d0f0 100644 (file)
--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -25,7 +25,7 @@ show_parsing_error (GtkCssProvider *provider,
                                           gtk_css_section_get_end_line (section),
                                           gtk_css_section_get_end_position (section));
 
-  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
+  if (error->domain == GTK_CSS_PARSER_WARNING)
     tag_name = "warning";
   else
     tag_name = "error";

diff --git a/demos/gtk-demo/css_pixbufs.c b/demos/gtk-demo/css_pixbufs.c
index cb315aa2632fe33e92c393c896bfdf3cbd58c8b9..7cd5b975bb8db2be403c54fb0294a5f9e61d0450 100644 (file)
--- a/demos/gtk-demo/css_pixbufs.c
+++ b/demos/gtk-demo/css_pixbufs.c
@@ -24,7 +24,7 @@ show_parsing_error (GtkCssProvider *provider,
                                           gtk_css_section_get_end_line (section),
                                           gtk_css_section_get_end_position (section));
 
-  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
+  if (error->domain == GTK_CSS_PARSER_WARNING)
     tag_name = "warning";
   else
     tag_name = "error";

diff --git a/demos/gtk-demo/css_shadows.c b/demos/gtk-demo/css_shadows.c
index 374f8a2d8e6b0cae7f973379e656d0d9e54b2150..318f12d632c60d8abf526e4f4f13fcce70398443 100644 (file)
--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -23,7 +23,7 @@ show_parsing_error (GtkCssProvider *provider,
                                           gtk_css_section_get_end_line (section),
                                           gtk_css_section_get_end_position (section));
 
-  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
+  if (error->domain == GTK_CSS_PARSER_WARNING)
     tag_name = "warning";
   else
     tag_name = "error";

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 3936a524d6c3115b11e461af4776a3c6196f36be..460f053d2f6f14de6c6f8fad74c496c690e2b236 100644 (file)
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -5086,8 +5086,9 @@ gtk_css_provider_load_from_path
 gtk_css_provider_load_from_resource
 gtk_css_provider_new
 gtk_css_provider_to_string
-GTK_CSS_PROVIDER_ERROR
-GtkCssProviderError
+GTK_CSS_PARSER_ERROR
+GtkCssParserError
+GtkCssParserWarning
 <SUBSECTION>
 GtkCssSection
 GtkCssSectionType

diff --git a/gdk/gdkversionmacros.h.in b/gdk/gdkversionmacros.h.in
index 856501119770e6ed38b153a226c30f4eb3504af0..75c725ce91ab2b1755c7ebe5783c6dac11191430 100644 (file)
--- a/gdk/gdkversionmacros.h.in
+++ b/gdk/gdkversionmacros.h.in
@@ -15,7 +15,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (__GTK_CSS_H_INSIDE__) && !defined (GDK_COMPILATION) && !defined (GTK_CSS_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gtk/css/gtkcss.h b/gtk/css/gtkcss.h
new file mode 100644 (file)
index 0000000..c68e6a4
--- /dev/null
+++ b/gtk/css/gtkcss.h
@@ -0,0 +1,39 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_CSS_H__
+#define __GTK_CSS_H__
+
+#define __GTK_CSS_H_INSIDE__
+
+#include <glib.h>
+#include <gdk/gdkversionmacros.h>
+
+#include <gtk/css/gtkcssenums.h>
+#include <gtk/css/gtkcssenumtypes.h>
+#include <gtk/css/gtkcsserror.h>
+
+#undef __GTK_CSS_H_INSIDE__
+
+#endif /* __GTK_CSS_H__ */

diff --git a/gtk/css/gtkcssenums.h b/gtk/css/gtkcssenums.h
new file mode 100644 (file)
index 0000000..e3c27ec
--- /dev/null
+++ b/gtk/css/gtkcssenums.h
@@ -0,0 +1,74 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_CSS_ENUMS_H__
+#define __GTK_CSS_ENUMS_H__
+
+#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_CSS_COMPILATION)
+#error "Only <gtk/css/gtkcss.h> can be included directly."
+#endif
+
+#include <glib.h>
+#include <gdk/gdkversionmacros.h>
+
+/**
+ * GtkCssParserError:
+ * @GTK_CSS_PARSER_ERROR_FAILED: Unknown failure.
+ * @GTK_CSS_PARSER_ERROR_SYNTAX: The given text does not form valid
+ *     syntax
+ * @GTK_CSS_PARSER_ERROR_IMPORT: Failed to import a resource
+ * @GTK_CSS_PARSER_ERROR_NAME: The given name has not been defined
+ * @GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE: The given value is not
+ *     correct
+ *
+ * Errors that can occur while parsing CSS.
+ * 
+ * These errors are unexpected and will cause parts of the given CSS
+ * to be ignored.
+ */
+typedef enum
+{
+  GTK_CSS_PARSER_ERROR_FAILED,
+  GTK_CSS_PARSER_ERROR_SYNTAX,
+  GTK_CSS_PARSER_ERROR_IMPORT,
+  GTK_CSS_PARSER_ERROR_NAME,
+  GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+} GtkCssParserError;
+
+/**
+ * GtkCssParserWarning:
+ * @GTK_CSS_PARSER_WARNING_DEPRECATED: The given construct is
+ *     deprecated and will be removed in a future version
+ *
+ * Warnings that can occur while parsing CSS.
+ *
+ * Unlike #GtkCssParserErrors, warnings do not cause the parser to
+ * skip any input, but they indicate issues that should be fixed.
+ */
+typedef enum
+{
+  GTK_CSS_PARSER_WARNING_DEPRECATED
+} GtkCssParserWarning;
+
+#endif /* __GTK_CSS_ENUMS_H__ */

diff --git a/gtk/css/gtkcssenumtypes.c.template b/gtk/css/gtkcssenumtypes.c.template
new file mode 100644 (file)
index 0000000..063b8d0
--- /dev/null
+++ b/gtk/css/gtkcssenumtypes.c.template
@@ -0,0 +1,38 @@
+/*** BEGIN file-header ***/
+#include "config.h"
+#include "gtkcssenumtypes.h"
+#include <gtkcss.h>
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@basename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+
+/*** END value-tail ***/

diff --git a/gtk/css/gtkcssenumtypes.h.template b/gtk/css/gtkcssenumtypes.h.template
new file mode 100644 (file)
index 0000000..f45dc26
--- /dev/null
+++ b/gtk/css/gtkcssenumtypes.h.template
@@ -0,0 +1,29 @@
+/*** BEGIN file-header ***/
+#ifndef __GTK_CSS_ENUM_TYPES_H__
+#define __GTK_CSS_ENUM_TYPES_H__
+
+#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_CSS_COMPILATION)
+#error "Only <gtk/css/gtkcss.h> can be included directly."
+#endif
+
+#include <glib-object.h>
+#include <gdk/gdkversionmacros.h>
+
+G_BEGIN_DECLS
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+
+/* enumerations from "@basename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GDK_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
+/*** END value-header ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* __GTK_CSS_ENUM_TYPES_H__ */
+/*** END file-tail ***/

diff --git a/gtk/css/gtkcsserror.c b/gtk/css/gtkcsserror.c
new file mode 100644 (file)
index 0000000..82428cd
--- /dev/null
+++ b/gtk/css/gtkcsserror.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2019 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+#include "config.h"
+
+#include "gtkcsserror.h"
+
+GQuark
+gtk_css_parser_error_quark (void)
+{
+  return g_quark_from_static_string ("gtk-css-parser-error-quark");
+}
+
+GQuark
+gtk_css_parser_warning_quark (void)
+{
+  return g_quark_from_static_string ("gtk-css-parser-warning-quark");
+}
+

diff --git a/gtk/css/gtkcsserror.h b/gtk/css/gtkcsserror.h
new file mode 100644 (file)
index 0000000..6f7dbee
--- /dev/null
+++ b/gtk/css/gtkcsserror.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2019 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+
+#ifndef __GTK_CSS_ERROR_H__
+#define __GTK_CSS_ERROR_H__
+
+#include <glib.h>
+#include <gdk/gdkversionmacros.h>
+
+/**
+ * GTK_CSS_PARSER_ERROR:
+ *
+ * Domain for #GtkCssParser errors.
+ */
+#define GTK_CSS_PARSER_ERROR (gtk_css_parser_error_quark ())
+
+GDK_AVAILABLE_IN_ALL
+GQuark gtk_css_parser_error_quark (void);
+
+/**
+ * GTK_CSS_PARSER_WARNING:
+ *
+ * Domain for #GtkCssParser warnings.
+ */
+#define GTK_CSS_PARSER_WARNING (gtk_css_parser_warning_quark ())
+
+GDK_AVAILABLE_IN_ALL
+GQuark gtk_css_parser_warning_quark (void);
+
+#endif /* __GTK_CSS_ERROR_H__ */

diff --git a/gtk/css/meson.build b/gtk/css/meson.build
new file mode 100644 (file)
index 0000000..4a5d10b
--- /dev/null
+++ b/gtk/css/meson.build
@@ -0,0 +1,51 @@
+gtk_css_public_sources = files([
+  'gtkcsserror.c',
+])
+
+gtk_css_private_sources = files([
+])
+
+gtk_css_public_headers = files([
+  'gtkcssenums.h',
+  'gtkcsserror.h',
+])
+
+install_headers(gtk_css_public_headers, 'gtkcss.h', subdir: 'gtk-4.0/gtk/css')
+
+gtk_css_deps = [
+  libm,
+  glib_dep,
+  gobject_dep,
+  platform_gio_dep,
+]
+
+gtk_css_enums = gnome.mkenums('gtkcssenumtypes',
+                              sources: gtk_css_public_headers,
+                              c_template: 'gtkcssenumtypes.c.template',
+                              h_template: 'gtkcssenumtypes.h.template',
+                              install_dir: join_paths(gtk_includedir, 'gtk-4.0/gtk/css'),
+                              install_header: true)
+
+gtk_css_enum_h = gtk_css_enums[1]
+
+libgtk_css = static_library('gtk_css',
+                            sources: [
+                              gtk_css_public_sources,
+                              gtk_css_private_sources,
+                              gtk_css_enums,
+                            ],
+                            dependencies: gtk_css_deps,
+                            include_directories: [ confinc, ],
+                            c_args: [
+                              '-DGTK_CSS_COMPILATION',
+                              '-DG_LOG_DOMAIN="Gtk"',
+                              '-DG_LOG_STRUCTURED=1',
+                            ] + common_cflags,
+                            link_args: common_ldflags)
+
+# We don't have link_with: to internal static libs here on purpose, just
+# list the dependencies and generated headers and such, for use in the
+# "public" libgtk_dep used by internal executables.
+libgtk_css_dep = declare_dependency(include_directories: [ confinc, ],
+                                sources: [ gtk_css_enum_h ],
+                                dependencies: gtk_css_deps)

diff --git a/gtk/gtk.h b/gtk/gtk.h
index e460b8dbb0efd526b28f2e34dcd67299b955e848..9358fcd517e78aa1f2e308844c93d6c5dfa0c34c 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -27,7 +27,10 @@
 
 #define __GTK_H_INSIDE__
 
+#include <gtk/css/gtkcss.h>
 #include <gdk/gdk.h>
+#include <gsk/gsk.h>
+
 #include <gtk/gtkaboutdialog.h>
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkaccellabel.h>

diff --git a/gtk/gtkcssimagerecolor.c b/gtk/gtkcssimagerecolor.c
index 39ba7bd6f52497407119404018df9eb736238e01..b771e3a91cf914e2319cce2866e1ca02dc8d6017 100644 (file)
--- a/gtk/gtkcssimagerecolor.c
+++ b/gtk/gtkcssimagerecolor.c
@@ -155,8 +155,8 @@ gtk_css_image_recolor_load (GtkCssImageRecolor  *recolor,
 
           uri = g_file_get_uri (recolor->file);
           g_set_error (gerror,
-                       GTK_CSS_PROVIDER_ERROR,
-                       GTK_CSS_PROVIDER_ERROR_FAILED,
+                       GTK_CSS_PARSER_ERROR,
+                       GTK_CSS_PARSER_ERROR_FAILED,
                        "Error loading image '%s': %s", uri, local_error->message);
           g_free (uri);
        }

diff --git a/gtk/gtkcssimageurl.c b/gtk/gtkcssimageurl.c
index 042ade52ff6856008385bb0b4afc61e5796d4a4d..b4db3740a4710ec06ca5e15130ee3adae4cf15cc 100644 (file)
--- a/gtk/gtkcssimageurl.c
+++ b/gtk/gtkcssimageurl.c
@@ -65,8 +65,8 @@ gtk_css_image_url_load_image (GtkCssImageUrl  *url,
 
           uri = g_file_get_uri (url->file);
           g_set_error (error,
-                       GTK_CSS_PROVIDER_ERROR,
-                       GTK_CSS_PROVIDER_ERROR_FAILED,
+                       GTK_CSS_PARSER_ERROR,
+                       GTK_CSS_PARSER_ERROR_FAILED,
                        "Error loading image '%s': %s", uri, local_error->message);
           g_free (uri);
        }

diff --git a/gtk/gtkcsskeyframes.c b/gtk/gtkcsskeyframes.c
index b4b0c6c48cc88beed1eec2a20b08603eed6c1499..267012aa554c70f05002f5a83ae0cfe49a9d45a8 100644 (file)
--- a/gtk/gtkcsskeyframes.c
+++ b/gtk/gtkcsskeyframes.c
@@ -238,7 +238,7 @@ parse_declaration (GtkCssKeyframes *keyframes,
   property = _gtk_style_property_lookup (name);
   if (property == NULL)
     {
-      /* should be GTK_CSS_PROVIDER_ERROR_NAME */
+      /* should be GTK_CSS_PARSER_ERROR_NAME */
       _gtk_css_parser_error (parser, "No property named '%s'", name);
       g_free (name);
       return FALSE;

diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c
index 25b86f3cb8923e4060c334e0e195e8a0063675ff..b64165efe4cbdf76fc41d1ed0541cfbba7086de4 100644 (file)
--- a/gtk/gtkcssparser.c
+++ b/gtk/gtkcssparser.c
@@ -194,8 +194,8 @@ _gtk_css_parser_error (GtkCssParser *parser,
   va_list args;
 
   va_start (args, format);
-  error = g_error_new_valist (GTK_CSS_PROVIDER_ERROR,
-                              GTK_CSS_PROVIDER_ERROR_SYNTAX,
+  error = g_error_new_valist (GTK_CSS_PARSER_ERROR,
+                              GTK_CSS_PARSER_ERROR_SYNTAX,
                               format, args);
   va_end (args);
 

diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
index 73b498a4fa1d8ae35dd4c564e863487673db0fe3..f5c4fdddc8d852a2b66870f8a929ed8b53a96d77 100644 (file)
--- a/gtk/gtkcssparserprivate.h
+++ b/gtk/gtkcssparserprivate.h
@@ -20,6 +20,8 @@
 
 #include <gtk/gtkcssprovider.h>
 
+#include <gtk/css/gtkcss.h>
+
 G_BEGIN_DECLS
 
 typedef struct _GtkCssParser GtkCssParser;

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 42d792ca50f3c2ff09ac3c0536ba0636bc55ca6e..383568dd98ee945b468243cbfb4e1df1cd57329a 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -142,12 +142,6 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
                                 GFile          *file,
                                 const char     *data);
 
-GQuark
-gtk_css_provider_error_quark (void)
-{
-  return g_quark_from_static_string ("gtk-css-provider-error-quark");
-}
-
 G_DEFINE_TYPE_EXTENDED (GtkCssProvider, gtk_css_provider, G_TYPE_OBJECT, 0,
                         G_ADD_PRIVATE (GtkCssProvider)
                         G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER,
@@ -720,8 +714,8 @@ gtk_css_provider_invalid_token (GtkCssProvider *provider,
 {
   gtk_css_provider_error (provider,
                           scanner,
-                          GTK_CSS_PROVIDER_ERROR,
-                          GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                          GTK_CSS_PARSER_ERROR,
+                          GTK_CSS_PARSER_ERROR_SYNTAX,
                           "expected %s", expected);
 }
 
@@ -818,8 +812,8 @@ parse_import (GtkCssScanner *scanner)
        char *path = g_file_get_path (file);
        gtk_css_provider_error (scanner->provider,
                                scanner,
-                               GTK_CSS_PROVIDER_ERROR,
-                               GTK_CSS_PROVIDER_ERROR_IMPORT,
+                               GTK_CSS_PARSER_ERROR,
+                               GTK_CSS_PARSER_ERROR_IMPORT,
                                "Loading '%s' would recurse",
                                path);
        g_free (path);
@@ -860,8 +854,8 @@ parse_color_definition (GtkCssScanner *scanner)
     {
       gtk_css_provider_error_literal (scanner->provider,
                                       scanner,
-                                      GTK_CSS_PROVIDER_ERROR,
-                                      GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                                      GTK_CSS_PARSER_ERROR,
+                                      GTK_CSS_PARSER_ERROR_SYNTAX,
                                       "Not a valid color name");
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
       gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
@@ -883,8 +877,8 @@ parse_color_definition (GtkCssScanner *scanner)
       _gtk_css_value_unref (color);
       gtk_css_provider_error_literal (scanner->provider,
                                       scanner,
-                                      GTK_CSS_PROVIDER_ERROR,
-                                      GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                                      GTK_CSS_PARSER_ERROR,
+                                      GTK_CSS_PARSER_ERROR_SYNTAX,
                                       "Missing semicolon at end of color definition");
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
 
@@ -918,8 +912,8 @@ parse_keyframes (GtkCssScanner *scanner)
     {
       gtk_css_provider_error_literal (scanner->provider,
                                       scanner,
-                                      GTK_CSS_PROVIDER_ERROR,
-                                      GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                                      GTK_CSS_PARSER_ERROR,
+                                      GTK_CSS_PARSER_ERROR_SYNTAX,
                                       "Expected name for keyframes");
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
       goto exit;
@@ -929,8 +923,8 @@ parse_keyframes (GtkCssScanner *scanner)
     {
       gtk_css_provider_error_literal (scanner->provider,
                                       scanner,
-                                      GTK_CSS_PROVIDER_ERROR,
-                                      GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                                      GTK_CSS_PARSER_ERROR,
+                                      GTK_CSS_PARSER_ERROR_SYNTAX,
                                       "Expected '{' for keyframes");
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
       g_free (name);
@@ -951,8 +945,8 @@ parse_keyframes (GtkCssScanner *scanner)
     {
       gtk_css_provider_error_literal (scanner->provider,
                                       scanner,
-                                      GTK_CSS_PROVIDER_ERROR,
-                                      GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                                      GTK_CSS_PARSER_ERROR,
+                                      GTK_CSS_PARSER_ERROR_SYNTAX,
                                       "expected '}' after declarations");
       if (!_gtk_css_parser_is_eof (scanner->parser))
         _gtk_css_parser_resync (scanner->parser, FALSE, 0);
@@ -978,8 +972,8 @@ parse_at_keyword (GtkCssScanner *scanner)
     {
       gtk_css_provider_error_literal (scanner->provider,
                                       scanner,
-                                      GTK_CSS_PROVIDER_ERROR,
-                                      GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                                      GTK_CSS_PARSER_ERROR,
+                                      GTK_CSS_PARSER_ERROR_SYNTAX,
                                       "unknown @ rule");
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
     }
@@ -1061,8 +1055,8 @@ parse_declaration (GtkCssScanner *scanner,
         {
           gtk_css_provider_error (scanner->provider,
                                   scanner,
-                                  GTK_CSS_PROVIDER_ERROR,
-                                  GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                                  GTK_CSS_PARSER_ERROR,
+                                  GTK_CSS_PARSER_ERROR_SYNTAX,
                                   "Junk at end of value for %s", property->name);
           _gtk_css_parser_resync (scanner->parser, TRUE, '}');
           gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
@@ -1111,8 +1105,8 @@ check_for_semicolon:
         {
           gtk_css_provider_error_literal (scanner->provider,
                                           scanner,
-                                          GTK_CSS_PROVIDER_ERROR,
-                                          GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                                          GTK_CSS_PARSER_ERROR,
+                                          GTK_CSS_PARSER_ERROR_SYNTAX,
                                           "Expected semicolon");
           _gtk_css_parser_resync (scanner->parser, TRUE, '}');
         }
@@ -1149,8 +1143,8 @@ parse_ruleset (GtkCssScanner *scanner)
     {
       gtk_css_provider_error_literal (scanner->provider,
                                       scanner,
-                                      GTK_CSS_PROVIDER_ERROR,
-                                      GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                                      GTK_CSS_PARSER_ERROR,
+                                      GTK_CSS_PARSER_ERROR_SYNTAX,
                                       "expected '{' after selectors");
       _gtk_css_parser_resync (scanner->parser, FALSE, 0);
       g_slist_free_full (selectors, (GDestroyNotify) _gtk_css_selector_free);
@@ -1164,8 +1158,8 @@ parse_ruleset (GtkCssScanner *scanner)
     {
       gtk_css_provider_error_literal (scanner->provider,
                                       scanner,
-                                      GTK_CSS_PROVIDER_ERROR,
-                                      GTK_CSS_PROVIDER_ERROR_SYNTAX,
+                                      GTK_CSS_PARSER_ERROR,
+                                      GTK_CSS_PARSER_ERROR_SYNTAX,
                                       "expected '}' after declarations");
       if (!_gtk_css_parser_is_eof (scanner->parser))
         {
@@ -1298,8 +1292,8 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
 
           gtk_css_provider_error (css_provider,
                                   scanner,
-                                  GTK_CSS_PROVIDER_ERROR,
-                                  GTK_CSS_PROVIDER_ERROR_IMPORT,
+                                  GTK_CSS_PARSER_ERROR,
+                                  GTK_CSS_PARSER_ERROR_IMPORT,
                                   "Failed to import: %s",
                                   load_error->message);
 

diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h
index 4d5550373d547dc95226c70e40b0b72468bb0a0c..4f6bac5cf1e8d259fc9663eaf7c05d5ff9e10539 100644 (file)
--- a/gtk/gtkcssprovider.h
+++ b/gtk/gtkcssprovider.h
@@ -30,37 +30,6 @@ G_BEGIN_DECLS
 #define GTK_IS_CSS_PROVIDER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_CSS_PROVIDER))
 #define GTK_CSS_PROVIDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_CSS_PROVIDER, GtkCssProviderClass))
 
-/**
- * GTK_CSS_PROVIDER_ERROR:
- *
- * Domain for #GtkCssProvider errors.
- */
-#define GTK_CSS_PROVIDER_ERROR (gtk_css_provider_error_quark ())
-
-/**
- * GtkCssProviderError:
- * @GTK_CSS_PROVIDER_ERROR_FAILED: Failed.
- * @GTK_CSS_PROVIDER_ERROR_SYNTAX: Syntax error.
- * @GTK_CSS_PROVIDER_ERROR_IMPORT: Import error.
- * @GTK_CSS_PROVIDER_ERROR_NAME: Name error.
- * @GTK_CSS_PROVIDER_ERROR_DEPRECATED: Deprecation error.
- * @GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE: Unknown value.
- *
- * Error codes for %GTK_CSS_PROVIDER_ERROR.
- */
-typedef enum
-{
-  GTK_CSS_PROVIDER_ERROR_FAILED,
-  GTK_CSS_PROVIDER_ERROR_SYNTAX,
-  GTK_CSS_PROVIDER_ERROR_IMPORT,
-  GTK_CSS_PROVIDER_ERROR_NAME,
-  GTK_CSS_PROVIDER_ERROR_DEPRECATED,
-  GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE
-} GtkCssProviderError;
-
-GDK_AVAILABLE_IN_ALL
-GQuark gtk_css_provider_error_quark (void);
-
 typedef struct _GtkCssProvider GtkCssProvider;
 typedef struct _GtkCssProviderClass GtkCssProviderClass;
 typedef struct _GtkCssProviderPrivate GtkCssProviderPrivate;

diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c
index e28eb8acb625eddd2bced6e3801564670488af46..7033bbd047ec5632c7f4abd58ed9efc831bce953 100644 (file)
--- a/gtk/inspector/css-editor.c
+++ b/gtk/inspector/css-editor.c
@@ -36,6 +36,7 @@
 #include "gtktooltip.h"
 #include "gtktextiter.h"
 
+#include "gtk/css/gtkcss.h"
 
 struct _GtkInspectorCssEditorPrivate
 {
@@ -305,7 +306,7 @@ show_parsing_error (GtkCssProvider        *provider,
                                           gtk_css_section_get_end_line (section),
                                           gtk_css_section_get_end_position (section));
 
-  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
+  if (error->domain == GTK_CSS_PARSER_WARNING)
     tag_name = "warning";
   else
     tag_name = "error";

diff --git a/gtk/meson.build b/gtk/meson.build
index e38effb93c1b8fa403762b533f81e74c80e0c0a9..7ee01c2ff04514a165d862f5044b42b1345c4062 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -841,7 +841,7 @@ typefuncs = custom_target('gtktypefuncs.inc',
                             gtk_public_headers +
                             gtk_deprecated_headers +
                             [ gtktypebuiltins_h, ] +
-                            [ gdkenum_h, gskenum_h, ],
+                            [ gtk_css_enum_h, gdkenum_h, gskenum_h, ],
                           command: [
                             find_program('gentypefuncs.py'),
                             '@OUTPUT@',
@@ -993,8 +993,8 @@ libgtk = shared_library('gtk-4',
                         sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
                         c_args: gtk_cargs + common_cflags,
                         include_directories: [confinc, gdkinc, gskinc, gtkinc],
-                        dependencies: gtk_deps + [libgdk_dep, libgsk_dep],
-                        link_with: [libgdk, libgsk, ],
+                        dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
+                        link_with: [libgtk_css, libgdk, libgsk, ],
                         link_args: common_ldflags,
                         install: true)
 
@@ -1119,7 +1119,7 @@ endif
 
 libgtk_dep = declare_dependency(sources: gtk_dep_sources,
                                 include_directories: [confinc, gtkinc],
-                                dependencies: gtk_deps + [libgdk_dep, libgsk_dep],
+                                dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
                                 link_with: libgtk,
                                 link_args: common_ldflags)
 

diff --git a/meson.build b/meson.build
index ab30f90098a7519611ce385fe1c297af416cbd2f..711b1cbbaa9e140b34c2e98802f9bcac5fecae2d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -681,6 +681,7 @@ if graphene_has_sse2 or graphene_has_gcc
   endif
 endif
 
+subdir('gtk/css')
 subdir('gdk')
 subdir('gsk')
 subdir('gtk')

diff --git a/tests/testboxcss.c b/tests/testboxcss.c
index e36db2ef58ee6381c6a7e9d78db2e6329a31a305..7742f7551006f5b789be718c90be0d0cf5f79ff1 100644 (file)
--- a/tests/testboxcss.c
+++ b/tests/testboxcss.c
@@ -61,7 +61,7 @@ show_parsing_error (GtkCssProvider *provider,
                                           gtk_css_section_get_end_line (section),
                                           gtk_css_section_get_end_position (section));
 
-  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
+  if (error->domain == GTK_CSS_PARSER_WARNING)
     tag_name = "warning";
   else
     tag_name = "error";

diff --git a/testsuite/css/parser/animation-crash-3.12.errors b/testsuite/css/parser/animation-crash-3.12.errors
index 8c9ecc4c9c768a396a499ef397cfb38357ef3494..035482eba3e2ffacdca801ae1a00103e70362f99 100644 (file)
--- a/testsuite/css/parser/animation-crash-3.12.errors
+++ b/testsuite/css/parser/animation-crash-3.12.errors
@@ -1 +1 @@
-animation-crash-3.12.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+animation-crash-3.12.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-01.errors b/testsuite/css/parser/at-invalid-01.errors
index 1bb2528f7c4f4f58cf73675f882d74c460f9617c..2c54e9ec9d2c24d341118c1b682801b2cc4acd23 100644 (file)
--- a/testsuite/css/parser/at-invalid-01.errors
+++ b/testsuite/css/parser/at-invalid-01.errors
@@ -1 +1 @@
-at-invalid-01.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-01.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-02.errors b/testsuite/css/parser/at-invalid-02.errors
index 9cf27d4b06efe2a43e153556b0e1c88e3001b83a..61307e3916d19c9036aaafc4efc7125159588635 100644 (file)
--- a/testsuite/css/parser/at-invalid-02.errors
+++ b/testsuite/css/parser/at-invalid-02.errors
@@ -1 +1 @@
-at-invalid-02.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-02.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-03.errors b/testsuite/css/parser/at-invalid-03.errors
index 1437e5a2c7e8fe4f5979531a96592a778d3d7472..5e9575f53af6dfb869f82eceac5d70a388d3dd5d 100644 (file)
--- a/testsuite/css/parser/at-invalid-03.errors
+++ b/testsuite/css/parser/at-invalid-03.errors
@@ -1 +1 @@
-at-invalid-03.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-03.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-04.errors b/testsuite/css/parser/at-invalid-04.errors
index dc09c8780f7111e95119f47e0f3e9ca9be477a16..c879cb35b6b95583de7174f2956073450a91b46e 100644 (file)
--- a/testsuite/css/parser/at-invalid-04.errors
+++ b/testsuite/css/parser/at-invalid-04.errors
@@ -1 +1 @@
-at-invalid-04.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-04.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-05.errors b/testsuite/css/parser/at-invalid-05.errors
index 3939d209c554ce75e87ce01ce846c62b6bf07ae9..6b606facada60b59a14207f47fb64fc20f055e28 100644 (file)
--- a/testsuite/css/parser/at-invalid-05.errors
+++ b/testsuite/css/parser/at-invalid-05.errors
@@ -1 +1 @@
-at-invalid-05.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-05.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-06.errors b/testsuite/css/parser/at-invalid-06.errors
index a21622da42d4ac24367b523eef1129460f91aca8..fbc5ecccdab9c52cd9cc69a55891359b39986b9c 100644 (file)
--- a/testsuite/css/parser/at-invalid-06.errors
+++ b/testsuite/css/parser/at-invalid-06.errors
@@ -1 +1 @@
-at-invalid-06.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-06.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-07.errors b/testsuite/css/parser/at-invalid-07.errors
index cc515cc26ef2347dcea75be49b9b955100484278..5abb2181b71e2fcdf545c1fa9d50421b934c69f4 100644 (file)
--- a/testsuite/css/parser/at-invalid-07.errors
+++ b/testsuite/css/parser/at-invalid-07.errors
@@ -1 +1 @@
-at-invalid-07.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-07.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-08.errors b/testsuite/css/parser/at-invalid-08.errors
index 46f6b7ae1ecb2f3a2b2e1d254f72e0c1c8f3d895..76d8e062101ddf029a0aae242f3b4be185162beb 100644 (file)
--- a/testsuite/css/parser/at-invalid-08.errors
+++ b/testsuite/css/parser/at-invalid-08.errors
@@ -1 +1 @@
-at-invalid-08.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-08.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-09.errors b/testsuite/css/parser/at-invalid-09.errors
index a2b633961e0e2eaa2976f06642ce37fa5d3eee0f..73cafa37293c8e66216d43331ba0257965936455 100644 (file)
--- a/testsuite/css/parser/at-invalid-09.errors
+++ b/testsuite/css/parser/at-invalid-09.errors
@@ -1 +1 @@
-at-invalid-09.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-09.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-10.errors b/testsuite/css/parser/at-invalid-10.errors
index b6f8505ec4c8003fb4aa3f236590139734c4b574..1b70899ac14bca78de6026156c40caa90f73891d 100644 (file)
--- a/testsuite/css/parser/at-invalid-10.errors
+++ b/testsuite/css/parser/at-invalid-10.errors
@@ -1 +1 @@
-at-invalid-10.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-10.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-11.errors b/testsuite/css/parser/at-invalid-11.errors
index 2a3ab6879a48166406e1d7c4d9b1c690fa2f17b5..d5a5d2a65b5d433d805545265d80ee7f6edbd461 100644 (file)
--- a/testsuite/css/parser/at-invalid-11.errors
+++ b/testsuite/css/parser/at-invalid-11.errors
@@ -1 +1 @@
-at-invalid-11.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-11.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-12.errors b/testsuite/css/parser/at-invalid-12.errors
index 4d0bfbc71f595868e9e205f4198136223a6f4ecf..d402333d1edb7bacba066ef5243906eb13bf8131 100644 (file)
--- a/testsuite/css/parser/at-invalid-12.errors
+++ b/testsuite/css/parser/at-invalid-12.errors
@@ -1 +1 @@
-at-invalid-12.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-12.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-13.errors b/testsuite/css/parser/at-invalid-13.errors
index a1bf96347dcb87ca07a70ab79afa1029e1875ad4..1cc20eb60e20aaebb5577a5bec3d281f422fcbe1 100644 (file)
--- a/testsuite/css/parser/at-invalid-13.errors
+++ b/testsuite/css/parser/at-invalid-13.errors
@@ -1 +1 @@
-at-invalid-13.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-13.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-14.errors b/testsuite/css/parser/at-invalid-14.errors
index 2ce10f4473a06fb0dadba193ff1cd4054e04798a..5ea3d4325013103324697999af898ce922208321 100644 (file)
--- a/testsuite/css/parser/at-invalid-14.errors
+++ b/testsuite/css/parser/at-invalid-14.errors
@@ -1 +1 @@
-at-invalid-14.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-14.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-15.errors b/testsuite/css/parser/at-invalid-15.errors
index c94855a71959195a3423232405499f396d486691..20c82221600562d811890bc14dfb22daef91d232 100644 (file)
--- a/testsuite/css/parser/at-invalid-15.errors
+++ b/testsuite/css/parser/at-invalid-15.errors
@@ -1 +1 @@
-at-invalid-15.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-15.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-16.errors b/testsuite/css/parser/at-invalid-16.errors
index cb821d90d363160ccdfd8aedbdba8e6c1ad3a0b1..36beecee49dfd0913e5b7fcb69049b05a6e47b23 100644 (file)
--- a/testsuite/css/parser/at-invalid-16.errors
+++ b/testsuite/css/parser/at-invalid-16.errors
@@ -1 +1 @@
-at-invalid-16.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-16.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-17.errors b/testsuite/css/parser/at-invalid-17.errors
index 0e129614018ef007a9d47cdf46939a068d221077..15c00b2f4af96e6d49217e9ad9906de66943cc6f 100644 (file)
--- a/testsuite/css/parser/at-invalid-17.errors
+++ b/testsuite/css/parser/at-invalid-17.errors
@@ -1 +1 @@
-at-invalid-17.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-17.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-18.errors b/testsuite/css/parser/at-invalid-18.errors
index 52e5d54cf52c48d11b7f78562b0e87176ee43c5c..7e39962835c6274286ea6433fde914314dd3f04c 100644 (file)
--- a/testsuite/css/parser/at-invalid-18.errors
+++ b/testsuite/css/parser/at-invalid-18.errors
@@ -1 +1 @@
-at-invalid-18.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-18.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-19.errors b/testsuite/css/parser/at-invalid-19.errors
index 1adccb24509d602287edab6c1e6de419189080b6..d58b5aeef7936d695f0f1c1757544c5d233feb6a 100644 (file)
--- a/testsuite/css/parser/at-invalid-19.errors
+++ b/testsuite/css/parser/at-invalid-19.errors
@@ -1 +1 @@
-at-invalid-19.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-19.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-20.errors b/testsuite/css/parser/at-invalid-20.errors
index 075ca994d5848e5795ca1d2ec0e65ab04ba00f51..533f9f6142ae2d9047f57067c94951bc5dcef540 100644 (file)
--- a/testsuite/css/parser/at-invalid-20.errors
+++ b/testsuite/css/parser/at-invalid-20.errors
@@ -1 +1 @@
-at-invalid-20.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-20.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/at-invalid-21.errors b/testsuite/css/parser/at-invalid-21.errors
index 3cc8423d55a62fd2d7da360b5574a8a247e22b6f..2a18d02336bc5632ea0d17f703e2ceec6dc96cc9 100644 (file)
--- a/testsuite/css/parser/at-invalid-21.errors
+++ b/testsuite/css/parser/at-invalid-21.errors
@@ -1,2 +1,2 @@
-at-invalid-21.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-at-invalid-21.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+at-invalid-21.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-21.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/background-position-errors.errors b/testsuite/css/parser/background-position-errors.errors
index 3322629343aa2097547b80888e4f7e1e22e0520a..de4b227414f8ac7816f3d2706f370e3c73fc71a3 100644 (file)
--- a/testsuite/css/parser/background-position-errors.errors
+++ b/testsuite/css/parser/background-position-errors.errors
@@ -1 +1 @@
-background-position-errors.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+background-position-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/background-position.errors b/testsuite/css/parser/background-position.errors
index 901454b0708e82ebf2c39112114975c1262e9679..8a3e2c2b7ca658b8c6ce17d91a4a43ed0bf9bda4 100644 (file)
--- a/testsuite/css/parser/background-position.errors
+++ b/testsuite/css/parser/background-position.errors
@@ -1,14 +1,14 @@
-background-position.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:18: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:66: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:70: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:90: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:102: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:110: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:122: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:126: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:150: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-background-position.css:154: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+background-position.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:18: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:66: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:70: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:90: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:102: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:110: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:122: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:126: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:150: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:154: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/border-infloop-3.12.errors b/testsuite/css/parser/border-infloop-3.12.errors
index 808dde302a51de1932feef68d75cdca809aff8a4..12870eb619bc438be97eddb16009aa62c8b183a3 100644 (file)
--- a/testsuite/css/parser/border-infloop-3.12.errors
+++ b/testsuite/css/parser/border-infloop-3.12.errors
@@ -1 +1 @@
-border-infloop-3.12.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+border-infloop-3.12.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/border-radius-shorthand.errors b/testsuite/css/parser/border-radius-shorthand.errors
index f8080201278656a4f45895d337c9e12adf2eaad9..55d3b8c184956635ce20d390cc011c0cf363e571 100644 (file)
--- a/testsuite/css/parser/border-radius-shorthand.errors
+++ b/testsuite/css/parser/border-radius-shorthand.errors
@@ -1,13 +1,13 @@
-border-radius-shorthand.css:64: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:68: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:72: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:76: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:80: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:84: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:88: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:92: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:96: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:100: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:104: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:108: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border-radius-shorthand.css:112: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+border-radius-shorthand.css:64: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:68: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:72: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:76: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:80: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:84: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:88: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:92: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:96: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:100: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:104: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:108: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:112: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/border.errors b/testsuite/css/parser/border.errors
index 7d17ea00c928a22a434e22406b55520c5b18babb..86d0d2a1ee914d61ce3fcc61b169a649fc84b3d6 100644 (file)
--- a/testsuite/css/parser/border.errors
+++ b/testsuite/css/parser/border.errors
@@ -1,8 +1,8 @@
-border.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border.css:30: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border.css:34: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border.css:46: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border.css:50: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-border.css:54: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+border.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:30: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:46: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:50: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:54: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/calc-errors.errors b/testsuite/css/parser/calc-errors.errors
index cb8139b2a784405e6650cfbe98047b193455e841..db05431565f356bdc9657dbc5c1d1e63e1b2a921 100644 (file)
--- a/testsuite/css/parser/calc-errors.errors
+++ b/testsuite/css/parser/calc-errors.errors
@@ -1,19 +1,19 @@
-calc-errors.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:10: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:14: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:18: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:22: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:30: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:34: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:46: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:50: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:54: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:58: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:62: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:66: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:70: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-calc-errors.css:74: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+calc-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:10: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:18: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:22: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:30: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:46: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:50: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:54: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:58: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:62: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:66: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:70: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:74: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/close-at-end-of-file.errors b/testsuite/css/parser/close-at-end-of-file.errors
index 69b3390b550c52e722a49294531793f8de096eb8..34159058df0b7dd04c634e08a50e8e64971f3f53 100644 (file)
--- a/testsuite/css/parser/close-at-end-of-file.errors
+++ b/testsuite/css/parser/close-at-end-of-file.errors
@@ -1 +1 @@
-close-at-end-of-file.css:3: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+close-at-end-of-file.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/colors-errors.errors b/testsuite/css/parser/colors-errors.errors
index dddf389837a61f0146f5dfc4ede3473957159be8..506c0b3ec4aed7880639489e153493de29241bb8 100644 (file)
--- a/testsuite/css/parser/colors-errors.errors
+++ b/testsuite/css/parser/colors-errors.errors
@@ -1,7 +1,7 @@
-colors-errors.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-colors-errors.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-colors-errors.css:10: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-colors-errors.css:14: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-colors-errors.css:18: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-colors-errors.css:22: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-colors-errors.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+colors-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+colors-errors.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
+colors-errors.css:10: error: GTK_CSS_PARSER_ERROR_SYNTAX
+colors-errors.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
+colors-errors.css:18: error: GTK_CSS_PARSER_ERROR_SYNTAX
+colors-errors.css:22: error: GTK_CSS_PARSER_ERROR_SYNTAX
+colors-errors.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/css-21-malformed-declarations.errors b/testsuite/css/parser/css-21-malformed-declarations.errors
index abff1633351101dd0fc754d797af2b8ca98dd0e6..128b52e2ceb3f2a28641ad4dd39931b73a479b96 100644 (file)
--- a/testsuite/css/parser/css-21-malformed-declarations.errors
+++ b/testsuite/css/parser/css-21-malformed-declarations.errors
@@ -1,6 +1,6 @@
-css-21-malformed-declarations.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-css-21-malformed-declarations.css:3: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-css-21-malformed-declarations.css:4: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-css-21-malformed-declarations.css:5: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-css-21-malformed-declarations.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-css-21-malformed-declarations.css:7: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+css-21-malformed-declarations.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:4: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:7: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/css-21-malformed-statements.errors b/testsuite/css/parser/css-21-malformed-statements.errors
index 3fdb2423324b5ad78588836db7b9a1d85d664f00..23b3b4b23a6f785f257a02b5900d03f50b4be2a3 100644 (file)
--- a/testsuite/css/parser/css-21-malformed-statements.errors
+++ b/testsuite/css/parser/css-21-malformed-statements.errors
@@ -1,4 +1,4 @@
-css-21-malformed-statements.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-css-21-malformed-statements.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-css-21-malformed-statements.css:3: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-css-21-malformed-statements.css:4: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+css-21-malformed-statements.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-statements.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-statements.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-statements.css:4: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/declarations-invalid-01.errors b/testsuite/css/parser/declarations-invalid-01.errors
index 2cfb1d5c50f84c65879f4ce54718a7abfc4ba01d..4114795b359039cf25f31580bf7b354093e0858c 100644 (file)
--- a/testsuite/css/parser/declarations-invalid-01.errors
+++ b/testsuite/css/parser/declarations-invalid-01.errors
@@ -1 +1 @@
-declarations-invalid-01.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+declarations-invalid-01.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/declarations-invalid-02.errors b/testsuite/css/parser/declarations-invalid-02.errors
index 6bee2172a47211b0fcf7be339ff19df8e0483523..b267550163c057010b6d32820eed077eb7077af4 100644 (file)
--- a/testsuite/css/parser/declarations-invalid-02.errors
+++ b/testsuite/css/parser/declarations-invalid-02.errors
@@ -1 +1 @@
-declarations-invalid-02.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+declarations-invalid-02.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/declarations-invalid-03.errors b/testsuite/css/parser/declarations-invalid-03.errors
index b2b74f0484bbc11f51258010f8be60f50afec80e..d804db4eb8a1ceb598a8ae0d1a79be0aabec57ef 100644 (file)
--- a/testsuite/css/parser/declarations-invalid-03.errors
+++ b/testsuite/css/parser/declarations-invalid-03.errors
@@ -1 +1 @@
-declarations-invalid-03.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+declarations-invalid-03.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/declarations-invalid-04.errors b/testsuite/css/parser/declarations-invalid-04.errors
index e16010dd9ed83fd44dfd1ac75b100554e9fc1b82..de0de60ddb68e8fcab278d405868c5dee3a9b8ca 100644 (file)
--- a/testsuite/css/parser/declarations-invalid-04.errors
+++ b/testsuite/css/parser/declarations-invalid-04.errors
@@ -1 +1 @@
-declarations-invalid-04.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+declarations-invalid-04.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/declarations-invalid-05.errors b/testsuite/css/parser/declarations-invalid-05.errors
index 1eb99746ca68b607bda25d91dc2c1689153f214b..061e4b27b30e6fef6f80e55ac22d06e8a946419d 100644 (file)
--- a/testsuite/css/parser/declarations-invalid-05.errors
+++ b/testsuite/css/parser/declarations-invalid-05.errors
@@ -1 +1 @@
-declarations-invalid-05.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+declarations-invalid-05.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/declarations-invalid-06.errors b/testsuite/css/parser/declarations-invalid-06.errors
index bc975761c79bf7281eefdcdb24d18018202fadd5..a10b6d26ad3b88c527ed5116b8fb914cd2306b8c 100644 (file)
--- a/testsuite/css/parser/declarations-invalid-06.errors
+++ b/testsuite/css/parser/declarations-invalid-06.errors
@@ -1 +1 @@
-declarations-invalid-06.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+declarations-invalid-06.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/declarations-invalid-07.errors b/testsuite/css/parser/declarations-invalid-07.errors
index 73f5e0ec25cc86375f1fca5af04bd0dd57d97881..43112526948d41883499a5a02f361540ec57c636 100644 (file)
--- a/testsuite/css/parser/declarations-invalid-07.errors
+++ b/testsuite/css/parser/declarations-invalid-07.errors
@@ -1 +1 @@
-declarations-invalid-07.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+declarations-invalid-07.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/declarations-invalid-08.errors b/testsuite/css/parser/declarations-invalid-08.errors
index a98b5165b2db2e4e8e6b04773244594207e80ede..de507ef742494bb8ce9a15f55faa3a2952c43484 100644 (file)
--- a/testsuite/css/parser/declarations-invalid-08.errors
+++ b/testsuite/css/parser/declarations-invalid-08.errors
@@ -1,3 +1,3 @@
-declarations-invalid-08.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations-invalid-08.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations-invalid-08.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+declarations-invalid-08.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-08.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-08.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/declarations.errors b/testsuite/css/parser/declarations.errors
index 0b36cbf81670de798ff33690348eaa7646c4070e..d80ddf9cc895636bbfeb69a3f76261c7bd7193c3 100644 (file)
--- a/testsuite/css/parser/declarations.errors
+++ b/testsuite/css/parser/declarations.errors
@@ -1,14 +1,14 @@
-declarations.css:24: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:28: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:30: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:32: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:34: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:36: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:40: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:44: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:46: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:48: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-declarations.css:50: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+declarations.css:24: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:28: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:30: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:32: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:36: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:40: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:44: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:46: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:48: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:50: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/does-not-exist.errors b/testsuite/css/parser/does-not-exist.errors
index 66b4a8c817051d59501f706830114ec2a04e91b6..0fb86c365db183f98179a76a38101222490434e7 100644 (file)
--- a/testsuite/css/parser/does-not-exist.errors
+++ b/testsuite/css/parser/does-not-exist.errors
@@ -1 +1 @@
-does-not-exist.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+does-not-exist.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/freed-string-in-error-messages.errors b/testsuite/css/parser/freed-string-in-error-messages.errors
index e48cf433b6ace97658ea2226321d4ccdee35784d..4e237ca5309c7bda12510dbc312f0404e3f7ee1e 100644 (file)
--- a/testsuite/css/parser/freed-string-in-error-messages.errors
+++ b/testsuite/css/parser/freed-string-in-error-messages.errors
@@ -1 +1 @@
-freed-string-in-error-messages.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+freed-string-in-error-messages.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/import-cyclic-1.errors b/testsuite/css/parser/import-cyclic-1.errors
index 988cfcbdb19820bf4ab2b24e57c2034f54b2b9b2..b88d31671e5f05bb99cb185cf320116fbdb89076 100644 (file)
--- a/testsuite/css/parser/import-cyclic-1.errors
+++ b/testsuite/css/parser/import-cyclic-1.errors
@@ -1 +1 @@
-import-cyclic-3.css:1: error: GTK_CSS_PROVIDER_ERROR_IMPORT
+import-cyclic-3.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT

diff --git a/testsuite/css/parser/import-cyclic-2.errors b/testsuite/css/parser/import-cyclic-2.errors
index dac7dadb1b19ea39eabdf6dddef8c182a770e78c..bf7fecbe91627e603b981fac1c8a0361be6c1501 100644 (file)
--- a/testsuite/css/parser/import-cyclic-2.errors
+++ b/testsuite/css/parser/import-cyclic-2.errors
@@ -1 +1 @@
-import-cyclic-1.css:1: error: GTK_CSS_PROVIDER_ERROR_IMPORT
+import-cyclic-1.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT

diff --git a/testsuite/css/parser/import-cyclic-3.errors b/testsuite/css/parser/import-cyclic-3.errors
index 4a0087a5224c826a13e5576633a05c310018dde9..154684e14ae338e20722f8e3640f64380e1a30f0 100644 (file)
--- a/testsuite/css/parser/import-cyclic-3.errors
+++ b/testsuite/css/parser/import-cyclic-3.errors
@@ -1 +1 @@
-import-cyclic-2.css:1: error: GTK_CSS_PROVIDER_ERROR_IMPORT
+import-cyclic-2.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT

diff --git a/testsuite/css/parser/import-nonexistant.errors b/testsuite/css/parser/import-nonexistant.errors
index 428d1110d23c8d2b41ec00d1b8603a171dc73fb4..db91da39d44d18b44a86f14a8537581246ccfd5f 100644 (file)
--- a/testsuite/css/parser/import-nonexistant.errors
+++ b/testsuite/css/parser/import-nonexistant.errors
@@ -1 +1 @@
-import-nonexistant.css:1: error: GTK_CSS_PROVIDER_ERROR_IMPORT
+import-nonexistant.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT

diff --git a/testsuite/css/parser/import-recursive.errors b/testsuite/css/parser/import-recursive.errors
index 89ceef1843d3927c57c3137b8f2d063eea34b244..4999ccc5a666797a6f7bffcc61365b1fa0da187e 100644 (file)
--- a/testsuite/css/parser/import-recursive.errors
+++ b/testsuite/css/parser/import-recursive.errors
@@ -1 +1 @@
-import-recursive.css:1: error: GTK_CSS_PROVIDER_ERROR_IMPORT
+import-recursive.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT

diff --git a/testsuite/css/parser/integer.errors b/testsuite/css/parser/integer.errors
index a6eedc73e6e2c18b1c43be4742940b7ca9555599..7eaf9586e2dbf731d0be0f8f0e5600498bea1d9d 100644 (file)
--- a/testsuite/css/parser/integer.errors
+++ b/testsuite/css/parser/integer.errors
@@ -1,12 +1,12 @@
-integer.css:5: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:8: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:11: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:14: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:17: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:23: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:29: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:32: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:35: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-integer.css:41: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+integer.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:8: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:11: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:17: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:23: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:29: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:32: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:35: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
+integer.css:41: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/property-name-errors.errors b/testsuite/css/parser/property-name-errors.errors
index 25a4cd7d1e70d33573273b0b6d98a6d42825b3a8..7d416a6cb8ffc67b4fc455f7cd61d300d2b4a1f4 100644 (file)
--- a/testsuite/css/parser/property-name-errors.errors
+++ b/testsuite/css/parser/property-name-errors.errors
@@ -1,2 +1,2 @@
-property-name-errors.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-property-name-errors.css:3: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+property-name-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+property-name-errors.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/pseudo-classes-unknown.errors b/testsuite/css/parser/pseudo-classes-unknown.errors
index 6f0baf6dbc1d3b247bd4418a8d31a78b79d5f0f4..47033c3933e738dc3a9daf1c04af8fdb9c2e4cd6 100644 (file)
--- a/testsuite/css/parser/pseudo-classes-unknown.errors
+++ b/testsuite/css/parser/pseudo-classes-unknown.errors
@@ -1,6 +1,6 @@
-pseudo-classes-unknown.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-pseudo-classes-unknown.css:5: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-pseudo-classes-unknown.css:9: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-pseudo-classes-unknown.css:13: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-pseudo-classes-unknown.css:17: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-pseudo-classes-unknown.css:21: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+pseudo-classes-unknown.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+pseudo-classes-unknown.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
+pseudo-classes-unknown.css:9: error: GTK_CSS_PARSER_ERROR_SYNTAX
+pseudo-classes-unknown.css:13: error: GTK_CSS_PARSER_ERROR_SYNTAX
+pseudo-classes-unknown.css:17: error: GTK_CSS_PARSER_ERROR_SYNTAX
+pseudo-classes-unknown.css:21: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/radial-background-position-error.errors b/testsuite/css/parser/radial-background-position-error.errors
index 252ab5a0622e95a61d12f1660a59c8d2c9d8f165..ee197a9fa9b313e2030a0db464ee99962269c338 100644 (file)
--- a/testsuite/css/parser/radial-background-position-error.errors
+++ b/testsuite/css/parser/radial-background-position-error.errors
@@ -1 +1 @@
-radial-background-position-error.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+radial-background-position-error.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/radial-positions.errors b/testsuite/css/parser/radial-positions.errors
index 92c2e07edfa2f6ce7c845a7bbe97431c4b33b5f4..85ca87bdf2ffa1d8908765d1fecdf2f05b90df83 100644 (file)
--- a/testsuite/css/parser/radial-positions.errors
+++ b/testsuite/css/parser/radial-positions.errors
@@ -1,3 +1,3 @@
-radial-positions.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-radial-positions.css:5: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-radial-positions.css:8: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+radial-positions.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+radial-positions.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
+radial-positions.css:8: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/single-slash.errors b/testsuite/css/parser/single-slash.errors
index e8e514cf75571c56f3bd5f43c8bba99f460ad63b..e282b22a467671a96b1ae172e8f74c2b2b8306ef 100644 (file)
--- a/testsuite/css/parser/single-slash.errors
+++ b/testsuite/css/parser/single-slash.errors
@@ -1 +1 @@
-single-slash.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+single-slash.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/test-css-parser.c b/testsuite/css/parser/test-css-parser.c
index f79c5804213c55e47f9c4d3f9ea7ab0d7a9bef74..311243d369f90e049ce225012a6584a194a4b445 100644 (file)
--- a/testsuite/css/parser/test-css-parser.c
+++ b/testsuite/css/parser/test-css-parser.c
@@ -150,8 +150,8 @@ parsing_error_cb (GtkCssProvider *provider,
                           basename, gtk_css_section_get_end_line (section) + 1);
   g_free (basename);
 
-  if (error->domain == GTK_CSS_PROVIDER_ERROR)
-      append_error_value (errors, GTK_TYPE_CSS_PROVIDER_ERROR, error->code);
+  if (error->domain == GTK_CSS_PARSER_ERROR)
+      append_error_value (errors, GTK_TYPE_CSS_PARSER_ERROR, error->code);
   else
     g_string_append_printf (errors, 
                             "%s %u\n",

diff --git a/testsuite/css/parser/text-shadow-invalid-but-worked-in-3.12.errors b/testsuite/css/parser/text-shadow-invalid-but-worked-in-3.12.errors
index 72c78ce98a31f975a96a9816564d2a837a167544..31bef5177e500a72cd1d4a747096f41f577cb9e9 100644 (file)
--- a/testsuite/css/parser/text-shadow-invalid-but-worked-in-3.12.errors
+++ b/testsuite/css/parser/text-shadow-invalid-but-worked-in-3.12.errors
@@ -1,2 +1,2 @@
-text-shadow-invalid-but-worked-in-3.12.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-text-shadow-invalid-but-worked-in-3.12.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+text-shadow-invalid-but-worked-in-3.12.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+text-shadow-invalid-but-worked-in-3.12.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/css/parser/value-none.errors b/testsuite/css/parser/value-none.errors
index 0c33e83ae390c30c8d8dc146ecb5213aab393c15..ac4d99a4688c5211a2d895eea2a5fbfa33b57055 100644 (file)
--- a/testsuite/css/parser/value-none.errors
+++ b/testsuite/css/parser/value-none.errors
@@ -1,31 +1,31 @@
-value-none.css:3: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:4: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:7: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:8: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:9: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:10: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:12: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:13: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:14: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:16: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:17: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:19: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:20: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:22: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:23: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:24: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:25: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:27: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:29: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:31: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:32: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:34: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:35: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:36: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:37: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:39: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:40: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:41: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+value-none.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:4: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:7: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:8: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:9: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:10: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:12: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:13: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:16: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:17: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:19: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:20: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:22: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:23: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:24: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:25: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:27: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:29: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:31: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:32: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:35: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:36: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:37: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:39: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:40: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:41: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX